Skip to content

Opened by mistake (meant for a fork) - #40865

Closed
batchema wants to merge 28 commits into
pingdotgg:mainfrom
batchema:chore/sync-upstream-3
Closed

batchema wants to merge 28 commits into
pingdotgg:mainfrom
batchema:chore/sync-upstream-3

Conversation

@batchema

@batchema batchema commented Nov 22, 2026 •

Copy link
Copy Markdown

Opened against this repository by mistake; it was meant for a personal fork. Closing. Sorry for the noise.

batchema and others added 28 commits November 11, 2026 11:48
Vim users had to leave their muscle memory at the composer. An opt-in vim
mode (Settings > Chat > Vim mode, the command palette, or the unbound
`composer.toggleVimMode` keybinding) adds insert and normal modes modeled on
Claude Code's `/vim`.

A pure engine in `composer-vim.ts` parses keys and computes motions, operators,
text objects, counts, `.` repeat and the unnamed register over flat text where a
chip is one character. `composer-vim-editor.ts` maps that text to the Tiptap
document with the existing coordinate helpers and applies each command as
ProseMirror transactions, so undo and redo use the editor's history and each
command is one undo step. Yanks keep their Markdown, so a put restores chips.

Menus and suggestions still take Escape first, Escape in normal mode keeps its
existing meaning, and Enter in normal mode goes through the send shortcut. A
footer badge shows the mode and normal mode draws a block cursor. Mobile is not
supported.

Co-authored-by: batchema <batchema@email.email>
VS Code users reach for Ctrl+` to open and close the terminal. Add it as a
second default for terminal.toggle, with literal Ctrl on every platform.

Existing keybindings.json files only get it as a late default when they still
have the stock mod+j binding, so customized terminal shortcuts stay untouched.
mod+j stays the shortcut shown in labels, and Reset to default in Settings now
restores the default a command is missing instead of one it already has.

Co-authored-by: batchema <batchema@email.email>
The thread details card was always open in threads without a per-thread
choice. Add Settings > Appearance > Open thread details by default (off),
and store per-thread choices as explicit overrides in both directions so
they survive changes to the setting. Older saved "closed" choices still load
as closed.

Also turn composer vim mode on by default.

Co-authored-by: batchema <batchema@email.email>
The to-do list moves from TODO.md to the fork's issues (#5, #6) so every
branch sees the same list. AGENTS.md tells agents to file new to-dos there.
* feat(server): agents can change settings and keyboard shortcuts

Agents could only change five curated preferences, so a request like
"turn on linked environments" ended with the user editing settings.json
by hand.

Replace t3_environment_preferences_update with tools over the services
the Settings page already uses: t3_environment_settings_read/update and
t3_keybindings_read, t3_keybinding_upsert and t3_keybinding_remove.
Settings travel as plain JSON validated server-side, so the tool list
grows by 1.4 KB rather than the full settings schema. Agents cannot
grant themselves browser or device access, and secrets read back
redacted.

* fix(server): agents cannot regain access through project overrides

Review found two holes in the new settings and keybinding tools.

A project override could grant an agent browser or device access, or
clear a denial, because only top-level keys were checked. Compare the
effective access for every project before and after the patch instead,
so agents can give access up but never take it.

Reading shortcuts re-encoded each rule through the 256-character config
schema, and the fully parenthesized `when` of a valid rule near the
limit overflowed it, failing the whole read. List rules in an unbounded
text form, validate new rules as the Settings page path does, and match
replace and remove targets against the listed rules.

* fix(server): check agent access inside the settings write lock

The access check read one settings snapshot and the write applied the
patch to whatever was current once it took the settings lock, so a user
change landing in between could turn an agent's harmless patch into a
grant.

updateSettings takes an optional check that runs inside the write lock
against the exact settings the patch is applied to; failing it aborts
the write. The environment tools pass their access check through it.
Handler tests now run against the in-memory settings service.

* fix(server): listed shortcut conditions write back within the limit

Listed rules printed `when` fully parenthesized, so a valid condition
near the 256-character limit came back too long to pass to
t3_keybinding_upsert. Print only the parentheses the parser needs to
rebuild the same tree, so a rule read back is no longer than its stored
form. Matching still compares parsed trees.

Restores the long-condition round-trip test that the previous commit
dropped by mistake.
Running the fork took a long command, Node had to come from nvm, and a
new machine had no way to set it up. scripts/sanucode wraps it:

- `sanucode` serves the web app, `sanucode app` opens the desktop app,
  both with their own data in ~/.sanucode
- `sanucode import` replaces that data with a fresh copy of the installed
  T3 Code's threads and preferences, keeping a backup
- `sanucode install` links `sanucode` and `sn` into ~/.local/bin

It runs vp on the Node version pinned in package.json, so a system Node
from nvm does not leak in.

Co-authored-by: batchema <batchema@email.email>
The sanucode command had no written path for switching over from an
installed T3 Code or reconnecting a phone and other machines, which the
import cannot carry over.

docs/operations/sanu-code.md covers setup, the one-time import, pairing
a phone from the desktop app, pairing machines with `t3 pair`, and day to
day use. AGENTS.md points to it.

Co-authored-by: batchema <batchema@email.email>
Merges pingdotgg/t3code main (2c607ad) into the fork.

Conflicts resolved:
- server.ts: upstream moved EnvironmentTheme.layer out of the shared
  merge; AppControl.layer joins Keybindings and UsageLimitSources.
- ws.ts: terminal attach takes upstream's cwd-recovery wrapper, keyed
  by the fork's socketClientId.
- ChatComposer.tsx: the vim mode badge hides with the attach button
  while dictation takes the footer.
- CommandPalette.tsx, Sidebar.tsx, t3McpToolPresentation.ts: keep both
  sides' imports and tool entries.
- agentContextBudget.json: re-measured.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream's theme service validates themes and stamps when they were
set, so clients may only change them through it. The settings tool
decoded the full server patch and let agents store a theme that does
not exist. It now uses the client patch and points at t3_theme_set.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A started thread could not change projects. Move to project (thread menu,
command palette, mobile row menu, and t3_thread_organize action `move`)
now moves an idle thread into another project's root folder:

- The thread keeps its id and history. A folder change ends its provider
  sessions, so the next turn resumes the conversation in the new folder,
  or seeds a fresh session from the thread when the provider can't resume.
- Scheduled tasks bound to the thread move with it.
- A confirm dialog, and the MCP result's `notice`, say what changes.
- A moved thread gets a checkpoint scope per project, so earlier diffs keep
  reading the repository they were captured in. Threads that never move
  keep today's scope id. A diff whose folder is gone now says so.

Part of #6
- Refuse a move while the thread's rollback effect is still pending or running.
- Scheduled tasks follow the thread's committed project, so racing moves converge.
- Turn diffs no longer depend on the current folder being a Git repository.
- Clearer move notice: files from earlier turns can't be restored after any move.
Fetching a selected turn's diff regardless of the current folder made
non-git turns, whose checkpoints are missing, show a load failure.
Historical diffs now load when the folder is git or the turn's
checkpoint is ready.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
feat: move a started thread to another project
A thread's conversation can now move to a project on another connected
machine. The client exports it from the source, imports it on the
target as run-less history (the same model V1 imports use, so the first
message hands it to a fresh provider session), then archives the source
with a note saying where it went. Checkpoints, files, worktrees,
attachments and scheduled tasks stay behind, and the confirmation names
only those that apply. A failed import changes nothing; a failed
archive is reported so the user doesn't keep two live copies.

Reachable from the sidebar and chat-header thread menus, the command
palette and the mobile row menu, on servers that advertise
threadMoveToMachine on both ends.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- Finishing a move refuses, and leaves the original active, when a run
  started on the source after the export; the client says the moved copy
  exists and why the original stayed.
- A second move of the same thread is ignored while one is in flight.
- Exports go through the transcript export's size preflight, budget and
  concurrency limit; imports refuse bundles over that budget.
- Imports use the source's provider when the target runs it, else the
  target project's default only when usable, else refuse with what to
  set up.
- The move menus need permission to change threads on the source too.
- The new thread's notice names only what stayed behind.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ctive

Retrying a failed preparation reuses the run's id and ordinal, so the
move revision (run count and newest run) stayed the same while the
retry added messages the export missed, and finish archived them. The
revision now also carries the latest run completion.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Provider-native subagents receive messages outside runs, so the move
revision can't tell when they change and finish could archive messages
the export missed. They stay with the thread that started them.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
feat: move a started thread to another machine
Merges pingdotgg/t3code main at 8cf97b5 (798 commits) into the fork.

Conflicts:
- Upstream translated the app (pingdotgg#37893). Fork UI strings now use gt()/msg()
  so `t3code/no-untranslated-copy` passes, and catalogs were regenerated on
  top of upstream's so existing translations are kept. New fork keys render
  English in other languages.
- t3ToolSummary: app-command and app-navigate ported to upstream's msg() cases.
- CommandPalette: keeps the fork's useRestartAgentSession hook, now translated.
- KeybindingsSettings.logic: keeps the fork's fallback order and adds
  upstream's rule that an unassigned default resets by key.
- SettingsPanels, PullRequestDetailPanel, mobile thread list: both sides kept.
- ws.ts: terminal writes pass the fork's socketClientId (upstream pingdotgg#37233).
- t3_app_navigate passes the caller scope to threadNotFound's new signature.
- agentContextBudget.json re-measured: 55296 bytes of tool list.
The Working section sat at the bottom of the thread list, below every
stopped, done, or blocked thread. On iOS and Android it now sits right
under pinned threads. A plain Inbox label marks where the rest of the
list starts, so those rows no longer read as part of Working. Folding,
the inbox order, and snoozed and settled stay as they were.

Closes #17
feat(mobile): working threads show above the inbox
@batchema batchema changed the title chore: sync with upstream main Opened by mistake (meant for a fork) Nov 22, 2026
@batchema batchema closed this Nov 22, 2026
@github-actions github-actions Bot added vouch:unvouched Author is not yet trusted in the VOUCHED list. size:XXL 1,000+ changed lines (additions + deletions). labels Nov 22, 2026
@github-actions

Copy link
Copy Markdown
Contributor

This PR changes the test suite by +44 test cases (browser +10, unit +17, server +17).

New browser test files: apps/web/src/components/ComposerPromptEditorTiptap.vim.browser.test.tsx, apps/web/src/lib/navigateSettled.browser.test.tsx.
Each browser test file costs CI seconds of module loading before its first test runs; a unit test costs milliseconds.

Keep tests that would fail for a real reason, and test logic below the UI where it can be. See Testing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL 1,000+ changed lines (additions + deletions). vouch:unvouched Author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant